merge trunk
authorKenichi Handa <handa@m17n.org>
Sat, 2 Oct 2010 01:21:42 +0000 (10:21 +0900)
committerKenichi Handa <handa@m17n.org>
Sat, 2 Oct 2010 01:21:42 +0000 (10:21 +0900)

Trivial merge